Merge tag 'upstream/2017.5' into debian/master
authorSimon McVittie <smcv@debian.org>
Wed, 19 Apr 2017 13:13:50 +0000 (14:13 +0100)
committerSimon McVittie <smcv@debian.org>
Wed, 19 Apr 2017 13:13:50 +0000 (14:13 +0100)
commit6ef9bdd60e969fe4be1c79079d9b5195ced6fb0e
tree17dd94935ad9ccbed76da1fe2e3adcdaed306af2
parentd7a728cf0e73d7584db7c0c4eba48151fcc5b480
parent9a063f1a8bb21187d366fc86197ff7e861630742
Merge tag 'upstream/2017.5' into debian/master

Upstream version 2017.5